auto upstream
authorJoakim Verona <joakim@verona.se>
Sat, 22 Dec 2012 20:16:43 +0000 (21:16 +0100)
committerJoakim Verona <joakim@verona.se>
Sat, 22 Dec 2012 20:16:43 +0000 (21:16 +0100)

Trivial merge